revert upstream merges from main repo