Reverting the 5984 port changes