Wait a moment, wasn't this already taken care of in a prior pull request/