Whoops, unstable code on the stable branch