Seems that these changes cause the failures in hibernate-envers tests. Need to investigate why.