Revert "Merge branch 'jsalyers-muting-v2' of gitlab.syncad.com:hive/hivemind into jsalyers-muting-v2" This reverts commit adffe0c9