Revert 0a10b99..094ce4b

This rolls back to commit 0a10b9997f6add2e4c70f0e8769b5f67af5078f3.