Full review (do not merge)

This is a bug! The idea is that smart-proxy shouldn't require either neither. Will investigate.