Roll out r27641 since the same bug was already fixed by r27568.