Restore pg_cmd removed via previous merge