Reverted back to old proxy system.