Revert 58121f7..7324ee6

This rolls back to commit 58121f7fa8d9090816e7d03f81e05e8217e1890e.