Undo the last change; it caused a compilation error when cross-compiling to