Merge "Revert license attribution change"