Release break fix again. vaughncm, r-cochran, bobthesatyr