GRAS-1367 Admin UI is consuming too much memory and eventually dies - REVERT