Commented out ZEN-9036 fix, still in progress