Revert 0e5c53a..4472bb3

This rolls back to commit 0e5c53a13cdcf5f30f04971a75d6d6f03e53bf2c.