[REV] Undo 29a9c1, causes endless loop during db creation, to be fixed