diff --git a/src/servers/app/drawing/Painter/Painter.cpp b/src/servers/app/drawing/Painter/Painter.cpp
index 0c8cdd9039..2a5d8e5738 100644
--- a/src/servers/app/drawing/Painter/Painter.cpp
+++ b/src/servers/app/drawing/Painter/Painter.cpp
@@ -1430,8 +1430,20 @@ Painter::_DrawBitmap(agg::rendering_buffer& srcBuffer, color_space format,
 	BBitmap* temp = NULL;
 	ObjectDeleter<BBitmap> tempDeleter;
 
+	
+
 	if ((format != B_RGBA32 && format != B_RGB32)
-		|| (format == B_RGB32 && fDrawingMode != B_OP_COPY)) {
+		|| (format == B_RGB32 && fDrawingMode != B_OP_COPY
+#if 0
+// Enabling this would make the behavior compatible to BeOS, which
+// treats B_RGB32 bitmaps as B_RGB*A*32 bitmaps in B_OP_ALPHA - unlike in
+// all other drawing modes, where B_TRANSPARENT_MAGIC_RGBA32 is handled.
+// B_RGB32 bitmaps therefore don't draw correctly on BeOS if they actually
+// use this color, unless the alpha channel contains 255 for all other
+// pixels, which is inconsistent.
+			&& fDrawingMode != B_OP_ALPHA)
+#endif
+		) {
 		temp = new (nothrow) BBitmap(actualBitmapRect, B_BITMAP_NO_SERVER_LINK,
 			B_RGBA32);
 		if (temp == NULL) {