Fixed Bluetooth Gate

Revert "Fix first build derp"
This reverts commit 817e76fb34fcf9c200d6ae7552d701a5ebef327a.
Merge remote-tracking branch 'pa/jellybean' into fjpa