Revert 6022ff3..06bb520

This rolls back to commit 6022ff34285251b1b95febaaa520f71b74f59e2a.