Fix from 5.34 was lost somehow.