Partially reverted ForwardOnlyMigration closes #436