Reverse changes in 3587, because currently there's not a good way to change animation and frame in one step.
Authored by: utunnels 2011-11-13
Parent: [r3589]
Child: [r3591]
