reverted changes to base64 usage