to get the tip of 8.0 to work 

current tip for me as of this checkout d3ac6ce08f282060ca6dc61de527b5b77885ab88