Revert 3161b68..5989992

This rolls back to commit 3161b68f3efb501bbbfd418f44aabc4ca36752b2.