Revert "Revert "Unbreak the APN editor""

This reverts commit e89807de438ab503ee02f4884a7acd95752b7e23.