Revert "Wind back everything before the winning alignment step"
Revert "Wind back everything before the winning alignment step"

This reverts commit b551cee506932707d0290ace62ff3062d020c3d8.

ekg/vg,ekg/vg,ekg/vg