Revert 8be08df..cb3ea61

This rolls back to commit 8be08df68bc5d6783fcce2968381184ff1eaaa1b.