Revert 7334d54..2001e3e

This rolls back to commit 7334d54791386209df32cb1b33d0a96b4339772e.