Code

changelog: Cleaning up the patches fixes #560554.