Revert bf57f14..dd7ab94

This rolls back to commit bf57f14c1751f9a9546be047602a210f9864d965.