Created attachment 3420 [details] [review] Proposed patch
It works as expected. Signed off.
Pushed, please test
*** Bug 1975 has been marked as a duplicate of this bug. ***