Revert r106870: doesn't seem like it would format things consistently as expected.