Revert "Merge branch 'dev' into vignette"

This reverts commit 1226087e5817e3d867f537d834259a24d971659a, reversing
changes made to e5b4cc6ec587eb97e296f8bac2fc9100cc216891.
Try to delete image to see if block vignette building