Remove the SPS hack from common, since it introduces compatibility problems for some devices