NXP-11704: remove ugly workaround