CLOUDIFY-2362 reverted