Comment 14 for bug 1730550

Yes, I was trying to see if just one commit fixed the bug. It's always best to introduce the least number of commits to fix a bug in a stable release.

I'll build another test kernel with the other commit as well and post it shortly.