Revert "Try to catch up on upstream F* changes"
Revert "Try to catch up on upstream F* changes"

This reverts commit 5b09f1f43b155df40caa8d8716075ccd7d08af26.

FStarLang/kremlin,FStarLang/kremlin,FStarLang/kremlin,FStarLang/kremlin