Revert "The TODO seems to be DONE"

Actually I am not sure at all.

This reverts commit 3b56738d88d881d023bdefda2222d99663f12b9f.
Add comment about portability

Change-Id: I289d3233f99b61115ed8efdea93cfabfbc53bcd7