Add 96611, test workaround for bug 1324670