Remove conditional code from 7.4 backport, just use the old
version. It's fine.