Revert "Merge from GC"

This reverts commit fb630bb5ddbe35da01e9519cb2741f5f15edf49a.