Revert 9bbb9ee..7d56e7b

This rolls back to commit 9bbb9eef5013cb822e8d68418dbd4bc2f953fbaf.