Swap option and command to old behaviour