Reverted to CustomScalaSerialization