Backed out changeset e91270a0c658
Backout bug 810411 because python 2.4 sucks.