see above. See previous reviews as to why this is unlikely to change, it's their mode of operation.
tested on HEAD amd64.
Unit Tests Skipped
Looks good to me. You probably have to update the diff again, however, since the port has been marked broken in between. Remember to mark it as MFH as well, since this change is needed in the quarterly branch as well.