Revert "First pass cosmetic fold-in with current site"

This reverts commit ff82cf209eddde2eda3b1844ec625c7f1399ed5a.