Revert 80732de..0d724d0

This rolls back to commit 80732debf8f6cb3568178c2b31b5fa89b5c71490.
1