remove a optimization that resulted in unexpected behavior #8929
3 files changed