remove the work around of codec bug

Change-Id: I1de4b449f12fa6eefeee3730eb35d08fcc94261d