Revert 2e7fdcb..9aee39f

This rolls back to commit 2e7fdcb50ed74446357105a810b7df73f3e75c80.