Backout bug 673569 because it's buggy