Revert 66b2abb..e3c9d6b

This rolls back to commit 66b2abb4ce85f0ab2292dff8603494138e61317f.