Matej, since you took over addressing bsc#1159563 I actually feel inclined to look into this one again :)