Hack for the post-move inconsistent state bug (OMS-401)