We will revert the changes that were introduced with this PR. If anyone wants to improve the performance of “null” entries for mappedBy one-to-one associations, the proper way to do this is by creating tombstone cache entries. I created https://hibernate.atlassian.net/browse/HHH-15540 for this purpose.