Revert e734fc1..8785822

This rolls back to commit e734fc1dc2104b67a7fb26dc7639832e3c92d2e7.