Remove "workaround".