[WIP] - Trying to fix migration dead-lock.