Revert PR16726: extend rol/ror matching

There is a buildbot failure. Need to investigate this.