upport missing 7cf4c12 and e5b28180a5