Revert "More changes."

This reverts commit 30be35152ccb0407cefd723536a02627e492d955.
Revert 7b6d785..ddd03c0

This rolls back to commit 7b6d785974a9889c3cfcefdc02de23814f77bf06.