Revisions from PR #3088.