Revert previous commit. Too many whitespace modification makes it painful to see the actual changes.

This reverts commit f1782d193379f01d0841e73e5a984f840bbc2e7f.