Reverted firstrun to d0a8db16c64dba147cce0ba4de52d5f56d9c286b