Revert "Merge pull request #13728 from huchengtw-moz/gallery/Bug_935072-v1.1.0hd"

This reverts commit 6e46d4d247f2ee15b79193e2f8368d3976b930d2, reversing
changes made to 77fbd88897006b0a3af6955dd0fb68a4eb476e8e.
Merge pull request #13734 from huchengtw-moz/gallery/Bug_935072-revert

Revert "Merge pull request #13728 from huchengtw-moz/gallery/Bug_935072-...