Reapply r206732. This time without optimization of branches.