redoing r91673 . Second step: Actually moving the files