This suggests that this PR is a bug fix, but the description only says it is a refactoring.