GF33186 reverted untestable fix