Revert e637715..a80ab13

This rolls back to commit e63771540bdf12adf68f5e1509ffe87db7c3fc95.