Merge "Fix badness from proxy refactoring."