Revert "Revert "Revert "photo"""

This reverts commit 17f00f2e754c45e4208b6dfb0008588667271a62.
Merge remote-tracking branch 'origin/master' into Photo