Fix build problem on 2.4

BKrev: 424af537WSbjQwKNDk8rE7lj52TmkA