Reverted changes regarding fleetctl API usage