Revert 9cfc18e..b3d1089

This rolls back to commit 9cfc18e85e77048fc26e9a3d0bd5a254dc0659ee.