Partially revert 10c490cdfe3ae042f747bd00f787492e2bdb7ed0

This commit broke some tests, and I don't have the time
to fix up all the expected output, so I'll revert the changes
to the affected files for now.

This needs to be redone with the necessary test fixes.
3 files changed