Revert "port"

This reverts commit 724b8b5c0e9475a7b1a90da370f9f9797ad12498.