When did you find this to be necessary? Looks unrelated to the multi-tenant stuff.