Revert "Attempted mac encoding fix"

This reverts commit c907b05e3c113da614e3c1a777b07997d4c63838.