r25310: Make sure we do not regress on r25309