is this an un-related issue? Then it should go in a separate pull request.