reorganization that was included in v4.2.3. Cost me most of the night to track down. svn: r18592
svn: r17207
svn: r17205