I fixed up the comment from the original patch to mark it clearly as needs work (XXX) and possible fixes