CMFM: Revert apostrophe workaround

Change-Id: If14609aeb17e975a48d6adfb104631284a028177