We are still depending on the avalon plugin :-/