cherrypicked commit war nicht strict.