Revert "port"

This reverts commit 42864befa5f742bfc32b2aa452687db62e7dcb09.