This reverts commit 130fe7f887. Also update to some newer decryption logic, and disable the new upstream logic, to avoid duplicate decryption attempts. Change-Id: Ibcea8b825d94284dfcf2d305b5f57423366601e5
130fe7f887