compatibility with R16B1
Revert "compatibility with R16B1"

This reverts commit 53468221c49e03f45d14b2461165ab76b3d07ead.