I left it around on purpose just in case we need to go back to the non-optimized code.