Undo the ElementTree import kludges for Python 2.4. (Partial merge)
Undo the ElementTree import kludges for Python 2.4. (Final merge)