Reverting commit r1748 again. r1786 pulled in in again
Authored by: edavis10 2008-09-10
Parent: [r1794]
Child: [r1796]