https://github.com/yahoo/ycb/pull/24