Revert 741a8f3..182ff92

This rolls back to commit 741a8f3bf35bd486ebf9621c7a1c4f5bdb784fd1.