Revert font change support

Change-Id: I1f1ecd348c485e370b92c4b49512a3bc5d9d56a7