Revert broken static proxy change.