Revert to c8d1021f5a