Cleanup

Replaced the adapter, no longer need this workaround.