Aidan O'Brien has reshuffled his Qatar Racing Champions Day plans, with Gstaad set to remain over a mile in the Queen Elizabeth II Stakes, while Constitution River will stick to 10 furlongs for the Champion Stakes