Move this up to a likely working port