Revert b2329f9..3199d17

This rolls back to commit b2329f9b0d0d4b88fe154cc00240f3628232b4e6.