Revert "Switch from userdebug to user"

This reverts commit bce046672b0e4f8ee0b085752d025c451117241f.