[jabley] add EC2 things back in