Continuing the switchover to just SMF 2.1