Revert "Syncing with primary repo"

This reverts commit f35aab89fba83626d145768b578401bd681554b5.