This reverts the most expensive part of 1e3383a41 (which seems to no longer be necessary after subsequent changes).
1e3383a41