Correct merge fuckup that broke the build.