revert 63425 over Guido's Febuary message about this, that I missed
3 files changed