Revert r485933
It was based on an older version of the port, revert until I work on it again
Approved by: bapt (mentor, implicit)