Revert back mainly to 1.2 build