Revert 7ef465a..e5f8372

This rolls back to commit 7ef465a0711353ad704a9ef4301fb06f1d8ea164.