Since we're going to use our own copy for now, I think all this commented code can also be removed.