Revert b3c98e3..b3bf1b1

This rolls back to commit b3c98e3e6c2957afce0f419d5946454b11cb9fd5.