Workaround badge and sound bug
Revert "Workaround badge and sound bug"

This reverts commit 82dd3cf4e3935fd132a28c995a950e166392e5ec.