Created attachment 11814 [details] Fix from master
To Karo for inclusion in 4.4
(In reply to Michael Adam from comment #2) Pushed to autobuild-v4-4-test.
Pushed to v4-4-test. Closing out bug report. Thanks!