These functions have been removed in master, and their
replacements are already available here.