226516ef20
This restores pre-66bd881ac5a6de636c2eea7528946bc2d3abd52c behavior, but merges the current search and output fixups currently in the tree.