revert part of r26176 to avoid large static allocation