Fix build from earlier merge