Added back the command-line variant.