FL-1154: restore vapigen check patch