Revert proxy fix - seems to make things worse