Fix for c8a60e0692f8e352fbd10eb26c33f8131c7e3c64 on initial bootstrap.