This probably conflicts with similar fixups from my pull request.