Revert "More content fixes."

This reverts commit b02504fc1d6a3b5a06e7ceffee086ebe42e6ba89.