Note this was accidentally reverted by the big branch merge in r53282, but was later reimplemented. :)