CB-3584: Something went weird in the repo.  This time for real.