(unstable) [fixed] Warping mobs and broken escorts.

Change-Id: Ic583f06fd0dec59544f7cf0d11d3888aadc2f948