Fixed the non-AES-NI implementation - I broke it again a commit or two ago.