Split another patch I've missed in r564088 which is needed for 460.xx.
Reported by: dhw Analyzed by: avg