Re-enable default APNS

This partially reverts commit f2458128d0db54cc4767a6d640de193c8f9c7bf4.

Change-Id: I3a99a0e51eb1a4319fc8127f727b754eb22cce6e