Revert "Cosmetic changes."

This reverts commit 11b4c8c07bf7ba67f810849c923878962ae7c57e.