Revert "Attempt to avoid conflicts with the new Ganglia module"

This reverts commit 332c5a020c0358819b435e480a00ddd1d2c2c650

Change-Id: I68c359481d2aed562ffe584dd3ae2960c004aa2b