This reverts commit 366e1faa. It looks like this exposes another set of crashes on the buildbots. Revert while I investigate.