Revert "Fix coding style." (BT Fixes)