bug 1641212: remove orphaned cruft and re-add something important
bug 1641212: remove orphaned cruft and re-add something important

mozilla-services/tecken,mozilla-services/tecken,mozilla-services/tecken,mozilla-services/tecken