This reverts commit c310717af2. Also update Gallery to a version that is compatible with this roll.
c310717af2