T7/T9 changes

T9 final phase timing adjustments. Removed "stop dps" from T7, now that
it's faceroll.
Revert "T7/T9 changes"

This reverts commit e981fae72db28911fbacaf6df0d4914b31fd50aa.