This reverts commit ff09c1bcbd.
ff09c1bcbd
more apktool bugs, I'm afraid. This reverts commit 16708c42dc.
16708c42dc
that was fast