Should maybe be marked with big fat TODO and an issue filed for that of course, or maybe a meta issue.