Rollback last S5 changes