This should fix regression reported in r96545