Reverted changes in variant.h and .cpp for travis CI.