Revert "SF: accommodate 1.2 format in sampling code"

This reverts commit 7994773b660775f1f1a029c7fdbe0885cb61ecee.

Reason for revert: broke build

Change-Id: Ib146556187088f57ec6aec0216ed1b4b270d8c9b
4 files changed