This reverts commit 19ca36b7.
BUG:492852
Didn't see this fixed yet. :) Together with 2cc13f8b, the kdiff3 works again.