this is no longer needed once the PR is rebased to master