Need to add back _loading_revision checks