Revert "changed message variables were literals"

This reverts commit 2f24bf6a654b617794d587e0b12d34176be3e09e.