Revert 74d58ff..c9fd2ce

This rolls back to commit 74d58ff311ffb93b49b8fa41430ffae03d298ffa.