since there's no history to preserve, and perform some fixups. PR: 21205 Submitted by: Ports Fury Approved by: Ports Wraith (no repo-copy)