Created attachment 3347 [details] [review] Proposed patch
Pushed, please test
*** Bug 5966 has been marked as a duplicate of this bug. ***