Revert "Don't calculate PUBLIC_IP unless necessary"

This reverts commit bb7dfa313ac15ffa88f549547f94c46ac5c465f7.

Conflicts:
	avahi-ps