This is still sketchy, perhaps later we can look into not needing to do this polling every 100ms. This does not block this pull request.