It just feels better for such a complex function.
Created attachment 13988 [details] Patch for 4.8 cherry-picked from master
Comment on attachment 13988 [details] Patch for 4.8 cherry-picked from master Pushed to autobuild-v4-8-test.
Pushed to v4-8-test. Closing out bug report. Thanks!