Back out changes for mediatype and move into a separate branch.