Revert "use 2.1 aware oobgc"

This reverts commit 5a7522c3580e682a324a51a87b2cbff154cf5320.