Revert "Sync with github"

This reverts commit 1b7941427e8ea5c58c010a82d9f23ee72849b6bd.