Changes for auto-restoring the push plugin