Revert "Changes but don't push these live yet."

This reverts commit 8b67907ca751eec0a7d5c3ade1093a665197abf6.