Revert e06f463..c4e2356

This rolls back to commit e06f463443a33d4704845a03a649de93b58e5cd5.
Gallery fixed