Thanks to Rizalist at Philippine Commentary for pointing out to me Atty. Alan F. Paguia’s keen and provocative legal analysis of PP 1021. According to Atty. Paguia, PGMA never lifted the military rule portion of PP 1017, only the state of national emergency. You can read all about it here.