return removed code, after merging with master.