Savepoint deserialization fixup - The class is an inner class, but not statically accessible. (#7270)

Savepoint deserialization fixup - The class is an inner class, but not statically accessible. (#7270) #21790