See above and the pull request comment