Revert 600f7e3..e02a612

This rolls back to commit 600f7e33aad3e8d7b463fd1a798acd727b7d59fa.