[1.7.x] Fix soft_applied in a way that doesn't break tests