Remove the commented-out, incorrect optimization