Fix build from mis-merge again