minor: removing 2.4 only feature from 2.2 branch