Revert "Merge pull request #3218 from AndroidSFV/aiphotoext2"

This reverts commit f2d850ee25c4c9f8fc3876b0c5453d44e8e02066, reversing
changes made to 805e2570bfaa3c7a06ab9d6ff5cb44de65dca34c.
Merge pull request #3493 from Miauw62/master

Revert "Merge pull request #3218 from AndroidSFV/aiphotoext2"