Switched to boost::variant-less implementation
Authored by: artyom-beilis 2012-06-23
Parent: [r2191]
Child: [r2193]