Bug 999574 is fixed.
So we could remove that.