Changed so that old columns are not removed yet (otherwise will cause
problems for roll out on multiple nodes on production).