This patch is temporary at it should be reverted in the future when a
better alternative is ready
Signed-off-by: Federico Vaga <federico.vaga@cern.ch>