Make SMF work for pre-2013Q3 too