Revert "more ports"

This reverts commit 6bc5f1dc726ead226c4a614b15185153e81dd648.