Revert "Yet more brig stuff"

This reverts commit 77badbec202f49ab436e038d4298ebeb80032301.