Revert "Port"

This reverts commit 764c46b86dd57644fefff32b2cdb5cff927a3db5.