revert change to Map.newBuilder