Comment # 13 on bug 1226463 from Jiri Slaby

I pushed a revert to stable.
   b4c384c6..178f0b6b      HEAD -> users/jslaby/stable/for-next