Merge "Revert "SF: accommodate 1.2 format in sampling code""