Comment out performance-degrading line, add TODO