Bug 980854 - Remove the workarounds for glitchy touch tones now that bug 848954 has landed