VE-782: Remove commented logic and leave note about why
VE-782: move loading indicator so it always displays, not just on initial load.