Revert "More on gallery ++"

This reverts commit 16491e014f02ec0ac729254500eecad4d4512527.