Revert 9d62189..97f6fe3

This rolls back to commit 9d62189b6deb0802aad21e7b1c8cf91ea124bba7.