Revert r16375: It broke aac decoding.