Revert cda72af4ac3f