CLOUDIFY-2073 revert execute plan changes