Revert "Brig fixes"

This reverts commit 781564ae8cd3a905557ee2235c36e67394a54531.