* Revert revert r41234 of ES-related changes. The site_stats complaint should be...