Back out previous fix, since gcc barfs on it. Have to find a fix that
works there too.
Authored by: dwarren 2013-11-13
Parent: [r7842]
Child: [r7844]
