Revert 75fc657..a2bee14

This rolls back to commit 75fc657718548f20888040a98fae5aee6c9d0f2b.