Revert to #f9e7678