Reverted bluetooth changes

Change-Id: Id39d2d311db5a8424caee528c0743075dcb7eeca