Release break fix. vaughncm, r-cochran, bobthesatyr