Merge "Revert "If rev_content_model is null, use page_content_model.""