Backed out previous change (change from Ish Rivera on Sept 5 to add
array level.