Cleaned up after pull request #2984.