Correctly pull-in 78b0b66d59693d5b.