somehow missed these changes during the portability branch back-merge