Bug 886055 - follow up, remove .orig files