Removed custom logic from URI generator expression integration.