Re-add josmeer's proxy server support