Bug 765 2

https://gist.github.com/aprzybyszewska/e8fd8d1aebd11e63500c