Add back missing files from 3de0027a