Revert 022061e..2ec65d6

This rolls back to commit 022061e7d0608ed9821e589e7e30d5039c092dfe.