Revert "First cut of deskew"

This reverts commit df8c4ab950a5585d79879eedbf4a199ef0630d22.