Reverting part of d0516d9 (see its comments) to prevent damage when installed on a not-so-emtpy site.