Separate pull request would be awesome.