revert 63965 for preformance reasons
1 file changed