Switch between clocks analog/digital fix

Bug https://bugzilla.mozilla.org/show_bug.cgi?id=882751 was fixed so I deleted the workaround that was used.

master -> please merge, tested 10/10 passes
v1-train -> please merge, tested 10/10 passes