Revert 6db2633..ef7b667

This rolls back to commit 6db26334fbdb1acc9db919b436c1317ee692c1a7.