Revert 6374a95..99c2b66

This rolls back to commit 6374a9562621973cace2d8c581561229bb1e573f.