Reworked addresses to support EC2 classic without legacy EC2 code

Change-Id: I8c8eee7574dec80edee14932f43e23002ee4da5e