Some evilness to help John.

John, just accept this pull request in the github interface.