CLOUDIFY-2370 oops. revert