Revert 92a29e5..0fb2877

This rolls back to commit 92a29e52bc533cc2bbfa239f0448c2ccae2992f7.