Revert 13 to support sf21 only