An attempt to workaround 1 more gcc issue
Authored by: artyom-beilis 2011-07-01
Parent: [r1849]
Child: [r1851]