Revert "another try"

This reverts commit 9afe0f4d00a79c2f75d80c9c48a4efcd92ae1da5.
Revert "Revert "another try""

This reverts commit 32edcc8dd7291bcc07a5ed53e1aea75eb2cae9a0.
Revert "another try"

This reverts commit 9afe0f4d00a79c2f75d80c9c48a4efcd92ae1da5.
Revert "second fix for image drawing"

This reverts commit b0c90fa5b8fca84d92ba0b83a02c5422d27e223c.