Server - Code refactoring.

- Reverted HDI calculation back to the original method, temporarily.