Revert 8570aa6..e53c7e0

This rolls back to commit 8570aa6dd516128c7ba4205cfb519aa757ff6255.