Comment 15 for bug 1468897

Reopening, since this was reverted in the updates, work is still in progress.