Yada, yada, pull request, second attempt...