Revert 089a283..4de1733

This rolls back to commit 089a283609cea596b6b5c74f22e3111ee99d1031.