Revert changes unrelated to annotations and type assertions