NXP-11397: temporarily revert until test fix found