Revert revert r40717 of my formatting change r40416.