bug 938061 - final  - r=zac

Let's abandon #14146. And use this instead.