trying to undo the damage from previous botched commit.
Authored by: gonnet 2013-05-10
Parent: [r459]
Child: [r461]