Can we append that comment with appropriate TODO for future along with specifying when that future will happen?