Revert "Revert "Merge pull request #139 from thecookiefactory/hotfix-v1.3.2""

This reverts commit 01c368e962a75e0f48a10ab669829205df92ebaa.
Revert "Attempt to fix not being able to delete images"

This reverts commit 51448c65bc6ef03cadf6f8e9bed236df027cca16.