OPAL-1564: Reverting to Chooser