Fix for introduced performance regression.