Revert "Sync changes from upstream repository"