Revert "br8-1,2"

This reverts commit 1af19b48073ccdfa420774b509adba919f4b32ab.