Default [Q] Replacing Emoticons with Stock-Emoticons in WhatsApp

Hey there!

I just updated to CM11 and realized that there is now an option to use the Google emoticons in chats. (or maybe it's been there before and I never noticed...) Anyhow, I can actually use those emojis in WhatsApp, but as soon as I type them they get replaced with the default emojis of WhatsApp. Is it somehow possible to change that so I can get rid of those horrible smileys without building my own apk?