A post-merge fix (the new command line client).