Revert the MEMORY_AND_DISK_SER changes.