Revert "Kate- merge conflict"

This reverts commit 215c175e59669b011c80fdd9dd02330224ff66f9.