make it work with latest master, again