Fix for a fix that was removed with a fix (see #62)
Reintroduced old migration path.