Re-rolled patch #5, Attached interdiff for same.