Revert "Sync changes from upstream repository"

Able to merge.