Merge "Revert "Change getting public net from pillar""