Reverted addition of new messages (will temporarilly go to a different
branch).