Follows up on https://hibernate.atlassian.net/browse/HSEARCH-4678
Because we may as well be consistent?