Revert "pull from tony"

Reverts snailflying/SAF#1