Restaging missing files

Let's see if we get it this time...
Faulty merge.