revert OOM-420 to avoid helm 2.3+ upgrade