Tried to redo commit bf503acc9036f43e9bdf5a1b86bd655ea6ad6855, fixing a build failure that did not appear on CIT