Eliminate the AirBitz watcher shim