Revert "Moved analyze back"

This reverts commit df6eb629dc2397211d4479419117a0c7faf355d2.