Try to solve the mess with .orig files