Revert b2ead25..88a4f15

This rolls back to commit b2ead25f1ab20e3cff6847d3f494deb9b0e8c45f.