This was actually Joel's commit that ended up in my pull request for some reason (it's already merged into master).