Revert update for 31/12/2012 CM11 snapshot compatibility