Revert b4a25f3..2adf386

This rolls back to commit b4a25f37d7952e6a173764d97a512906a04ef56f.