Readded removed code in 31e90cc0d4b7535fe2c7df8ff345f49153ecb4ca
Readded removed code in 31e90cc0d4b7535fe2c7df8ff345f49153ecb4ca

raintank/metrictank,raintank/metrictank,replay/metrictank,raintank/metrictank,raintank/raintank-metric,raintank/metrictank,raintank/raintank-metric,raintank/raintank-metric,replay/metrictank,replay/metrictank,replay/metrictank