Revert f894726..8c68109

This rolls back to commit f894726b6eb0fc50883310bce7be5b9afd63fce0.