David Wendt re-evaluated the current master build and it's stable now; removed that TODO.