Make animated tasks fly back to the right location

Also faster

Change-Id: I4d44670e1bac2ce1d5b90046a69f32ff90446c94