Reverted support of old flags as well for backward compatibility
Authored by: artyom-beilis 2010-06-23
Parent: [r1292]
Child: [r1294]