Reverted r17952 as well as this is fatal for most frame order models.
The command used was: svn merge -r17952:r17951 .
Authored by: bugman 2012-11-14
Parent: [r17966]
Child: [r17968]
