Revert 8d50db3..3e18211

This rolls back to commit 8d50db3a378a70f06f511b5016b2379b11c9de30.