Bug 969446 - Backout bug 957768 since it is now redundant, r=me