Bug 834160 - Part 1/N: interface changes.