SWF-2241 : Fix remove of DEPLOYMENT_ENABLED