Ok. I'm going to hold off on touching Panel.shift() until #6826 is settled.