Roll back r23388, fix it differently