Revert "HORNETQ-1242 :"

This reverts commit 63fdfc9df350ae3dffbe68b94b8eeb6c4ae8254f.