This reverts commit a650f2ec. The crashes it was causing will be fixed by the stacked diff {D140606}.