Revert "Nuke XXX TODO option. Suggested-by: BillM"
This reverts commit 207148139ec648b8955c81ae908d0bdb7c472cda.
Revert "Nuke XXX TODO option. Suggested-by: BillM"
This reverts commit 207148139ec648b8955c81ae908d0bdb7c472cda.