Revert "Changes to implement GCM"

This reverts commit 8a4a2760d67c3dae9553d3740498400facd51988.