Revert "Resync codebase"

This reverts commit 499c1a79a683444bb133a2ee3a4c819b962e45e5.