Migration errors (reverted from commit c2980021707ac8253fd9579434546623a2223210)