Bug 1016886 — Provide an unregister mechanism.