Partial redo of r45819: