ENG-4388: Whitespace fix and revert some hastily changed code after review.