Backout bug 705807 because it dun broke.