Add FIXME comment based on code review feedback by Hal Finkel on r209338