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