Revert "br7-12"

This reverts commit 63d806d71266bf453ae6fa4f15cd0f3659c9d212.
redo