Revert to c9201f90ba