I don't think we want that for the 1.7 branch?
Actually I don't expect it to build on CI.