Fix broken build caused by premature merge