Revert 388f2e5..0e7a7a9

This rolls back to commit 388f2e55ba6b5e1043f953f7a3eddd435e44c788.