* commit 'ff3b3ade7fa1da60d391d1a746cdc0868c24f4bf': Revert "Temporary Changes for certification of SCO."