Merge "Revert more visibility changes in HistoryBlob.php"