It should now be fixed with a slightly different fix (see rev#74532).