Revert f3a02fc..70d7bd5

This rolls back to commit f3a02fcae5825c45390d230d43394390f9f1db8a.