...and get rid of the useless ProxyEntry struct altogether

Change-Id: I846f126c96343da17518686e666a7d44c6b1bef1