Undo M4SCp parameters #346