Reverting replace delete -> adapt