To match MindTooth's pull request.