revert back the change about message class so that the class can be lazily loaded.