This is needed for Proxy's
I'm going to just do this as part of bug #154314 *** This bug has been marked as a duplicate of bug 154314 ***