This enum doesn't exist any more, so these won't be needed post-merge.