If these are disabled, they should be removed before the final merge.