Creating a specific bug report for this particular bit of cleanup.
Created attachment 5900 [details] [review]
Signed off Patch
Taking the bugfix from 6875, signing off, and moving to this report.
I'm signing off on this particular patch from 6875, and marking it as Passed QA.
Pushed please test
There have been no further reports of problems so I am marking this bug resolved.