Fix up the non-sandbox case.