TEMP WORKAROUND for the initial database building issues