Fixed 2.8 build breakage introduced back porting COMMAND.