Comment # 6 on bug 1227174 from Matej Cepl

This is just preliminary version, which needs to be discussed with the
upstream.