CLOUDIFY-2048 revert