See 3c9e6966, maybe that commit and equivalent
commits should be reverted unless there is a rationale reason to do so...