@uboness wondering if we still need this optimization, removing doesn't change anything, does it really help performance wise???