Revert to c6f81d4f70