Revert ed74d98..48e038c

This rolls back to commit ed74d98830966fca5bbf77216225c3a0ae109200.