Backout 6f35795603f7 from bug 1069568 as it's no longer needed.