Applied b5abe46054 to autoload/checkpoints/quickload as well.