I'm not sure this is right. This undoes what @andymckay was adding and could lead to an upsell app showing up in a region it shouldn't. But to fix the 500 and deal with this later I'm down.