The issue is caused by 1a79abdad, and annoyingly it's a regression since 2.69, so if we do 'a', this commit should be ported there.
1a79abdad