temporarily revert r112664, it is causing a decoding conflict, and