[MSAFD]: Addendum to r73203.