Don't use the metadata hack anymore. Requires updated recovery (TWRP-2.6.3)

Change-Id: I9071f6c6e09541773321d133db68b3b1fac6205e