tools: update countryblock to use octets and restore vs individual commands.