Revert e579ff8..fece86a

This rolls back to commit e579ff89e97469add0527110ab41806b1a084676.