Move more logic to mozawsdeploy.