[777] Revert 777 work on master branch.