Made it work with latest nightly