Clean up some artifacts from the merge to match the `jessie` branch. Keep the changes on master made with commits bfe6fe84 and e229c551.