Put the > 8 hack back to Exploration optimizer.