Where does this change come from? Maybe a rebase issue? The current master does not have this change. I think you have to revert this.