[ripcord/f31] (2 commits) ...Properly import sprm