Are the tests still valid with the workaround?  We could just remove the tests... Otherwise, that's not documented in the code  and probably should be.