This change may have caused some self-host failures. Reverting while investigating. This reverts commit c7fbe219.