Revert "retrieve master from elsewhere, since aws.instances isn't populated yet"

This reverts commit 5a8755ea8e048dfcb4dbdafeae0021e84a18325f.

that commit needs to move to a separate branch as it breaks master