Get rid of Func support from the contrib tree.