reverted changes for #6459 (doesn't apply on 2.x)
3 files changed