Revert "Revert "Revert "Several fixes for crawlability and other SEO related issues caused by the recent apptimizer upgrade."""

This reverts commit 167d6da4f17575c9372ec684ae038c1715759f62.