workaround for bz969325
Merge pull request #2722 from rajatchopra/move_fix

[TO_STAGE] workaround for bz969325