Removed the options that seem to be breaking things for sandboxes.