Finally get rid of the hacky proxy stuff.