Revert 2b43df7..0f37311

This rolls back to commit 2b43df780ee2c7db50f84b8ad3f11b58dc4ae825.