(just leaving this open to remind myself to remove the shim as soon as
I can get IA to fix their code)

