re-roll patch #18, Attached interdiff for same.