Revert "Handle BP mask register better to avoid useless BP writes (causing flushes)" This reverts commit 954be9e2d9bfca8b33ac1cb36d3226bf2555f2c1. Fixes issue 6826.
