Revert to CBC mode for AES

Tests assume this, but will likely use CTR by default later on.