Update to match changes in PR 1695