Reverting codec to original state before applying patch.

Change-Id: Ia276162f174bc1d036471f4015cf9cbc28b2ce1a