Revert fe1ac45..f7bb73d

This rolls back to commit fe1ac453fd7b4e37d840ed1e78e6fd850e03d8c0.