Revert "Bye,bye bugmailer"

This reverts commit 6ea2bac23938c72de76b92cc5027d6f9c56d60b4.