This reverts commit 679da63da6. Conflicts: OpenSim/Region/CoreModules/Avatar/Chat/ChatModule.cs
679da63da6