Revert "final commits to sync"

This reverts commit b3d2d294d8e0a715acfb09d7fe55557e39cd489d.