Revert "DO NOT MERGE Fix the remaining holes for access to APN data"

This reverts commit 06c21538c20229097e16b3d0aa367614824d9ac0.
1 file changed