Revert "Sync to Master"

This reverts commit feff42d59e539d0ccf7313a68aceb21f435790b3.