LPS-39134

This SF was not necessary for 6.1.x as these classes are not in compat.