Revert fd7a245..3e4dd21

This rolls back to commit fd7a245a67b351be254e9b2c24ab01e01276a601.