remove bitz warning merge #3413, fix #3271

[ci skip]
This tag has no release notes.