This reverts commit d3f5769d. Causes crashes on Chromium. Have reproducer, will reduce and send along.