alternate solution for revision 4 build only! (also works for unlock sim)
- flash
https://drive.google.com/open?id=1Yn...3edvv_qEO1T-02
- remove FRP/unlock SIM via box of choice
- factory reset if doing FRP
- flash stock boot.img back to phone
- profit.