Revert changes made since 3.3 release (changes were for 3.3.1 which was not released as 3.4 superceded)
Authored by: stephenbayliss 2010-09-27
Parent: [r8809]
Child: [r8811]