MFH to r338367.
In order to maintain a separation between the mechanical MFH and resolution of build errors, build error resolution will be a subsequent commit.