Fix build errors

-Revert all custom commits