Revert r106439, r106441 - bad formatting mushing separate lines together