Revert to d00afae885