Back to non-kw version.