Unbreak build after merge 2ea64524ce