Quick fix to make it easier to bypass waiver to get to verification for testing.