Additional files missing from [1f3fb4a61e]