Let's get rid of an SMF 1.1 relique