Yay pull requests

Apparently I forgot to pullreq this old commit.