Merge pull request #1 from jrperritt/unbreak-acceptance

[wip] Unbreak acceptance