Merge pull request #6344 from AndyAyersMS/UndoNetCIChange