Revert "Merge pull request #2304 from techAPJ/speech-bubble-update"

This reverts commit 6590ebbcbee712d0759cff8c9dd8c1c12a00619b, reversing
changes made to 3855ead62ef1caabfeba970c999696cee20036c4.