Revert "More tweaks."

This reverts commit 5ffd10a4ab7b695ec4a53e0e6b2f3d0594a63d62.
Revert 5ffd10a..27d24d6

This rolls back to commit 5ffd10a4ab7b695ec4a53e0e6b2f3d0594a63d62.
Revert 27cb744..6e26f8a

This rolls back to commit 27cb744d242b5a7d40d51380bbe70d06e5a7e6a3.