This reverts commit e7f104d0. Like in the previous release, this just makes boot either terribly slow or not working at all.