Revert "update common and data-provider"