Revert d984c98..bf2fb2b

This rolls back to commit d984c985042b2cabb39cfaa323069b0f9fa97195.