Revert "NOT USE! WARNING! CAN BREAK YOUR BT! 18 (Finish build fix 4. To test)"

This reverts commit 8d77dfd483f5d555f6f3947ea22213d13af424d2.