Restoring old version of diameter (take 2)