Rolling back ssa-fix