Try to fix the debug build after r130699