Actually add the files that were supposed to be added in 0b2b2ff1