Revert back to dae29671f99227c0ead1033402445d1dcd948cef