Bug 941142 - Use new markup for APN radio items. Regresion bug #914892