Revert 83b0165..4195227

This rolls back to commit 83b0165d474bd1d473b56ade4dc4127b256a15f4.