Rerun from C 648f12d29233