Revert "ssong25, jcheng26: BT optimization"

This reverts commit 38dcc448debc8fcd54218a167ddc1302be572304.