Merge change 20915

* changes:
  Hey, we don't need to set this flag any more!