Reverted r17954 as this is fatal for all the other frame order models.
The command used was: svn merge -r17954:r17953 .
Authored by: bugman 2012-11-14
Parent: [r17964]
Child: [r17966]
