Ticket #6650 (r23676) should also be pulled up to 1.8.