Revert "Project changes for cherry picking"

This reverts commit 259106612e9b6ba6a33b0f8bdac073e3864cd5aa.