Revert "Fixes #902 Smilies Improvements"

This reverts commit 504154d0a2d53cea5da19fba5441826aee4c7ed8.