Backout bug 1038243 for not actually helping.