Deal with all our tests failing since I214b3d4 got merged into core

For now this seems like the fastest fix. Until it is clear what I214b3d4 is actuallz required for
and we might adjust or find an alternative way, this global hack will do its service without caring
too much about other extensions.

Change-Id: I43ac49687c72284acc0907d9367b77d84816ca64