Comment 13 for bug 1739318

I've closed this bug since the immediate issue is fixed. In order to remove the workaround during move operations from change I34b1d99a9d0d2aca80f094a79ec1656abaf762dc we'd have to add an online data migration, but that could be done later separately from this bug.