Revert all recent APN changes/fixes