Revert e0485b4..876a807

This rolls back to commit e0485b4ae9035d7827c820efed0aaab18a45ba51.