9727e2df7a
am fairly certain that this should do it and that I may now remove the UM_ macros from port.h. I will, however, wait a few days to ensure that these can be safely removed.