Bug 848280 - Remove content-proxy