Remove the hack to avoid heap allocation, it's not needed any more.