Revert "Generalize shift_bb() to handle double pushes"