#675 introduced a ~10-15% performance regression. We should investigate whether we can eliminate this. If it cannot be removed entirely then the feature should be made optional.