Revert "Revert "tmp""

This reverts commit 0f69e803e7fdd66aa0c81dc35bd5438eeecf38f2.
Revert "Revert "workaround for ugly artifacts""

This reverts commit 6ffcb14bd8dfea529f9ec4c4e95dd91da1866d6f.