Remove workaround for old ridley issue.