Created attachment 667603 [details] Fix. Since I had the git repo already, I bisected this. The attached patch fixes the problem. MR ID# 365168