Because this is a hack, we should really wrap this in an expiring feature switch.