Revert ed83c42..441817b

This rolls back to commit ed83c42ab9f0a114a24a9178ad46011ec3deb6e8.