Revert "Apply the fix for 1bpp PNG (adb44619) again"

This reverts commit 5229d3d8f0139f407be79ea427e5e4f45dc23d84.
Merge branch 'release-0.22' into release