Manually putting in change from PR 22.