Really just reverted handleUnsupportedContent.