Revert "Revert "Revert "Unbreak the APN editor"""

This reverts commit 2b51c06e6de5734285ce4031f04f2fb699f5200f.