Merge "Remove old fork-and-specialize API"