Revert : "Remove old BT workaround"