Revert 3d50e98..01fe0a7

This rolls back to commit 3d50e98e2fcd22d2b6855eb921ede71d6d604e56.