I broke something

When trying to synchronize my desktop with the repository, several files
got messed up.