Follow-up patch to r162731.