1. Remove the part of r153848 which optimizes shuffle-of-shuffle into a new