Revert commenting out in r72239 (leaving whitespace changes