Note that I added the switch because some new tests were failing with async unsubscription.