Attempting to revert the revert. Hope it keeps the new comment on goodbye.cpp.

Revert "Testing reverting my change. Planning to re-revert shortly."

This reverts commit 1f0ed461b6fb9269e1cc144b470a7474e2aacac1.