potential this will need to be rolled back, but not much of a choice

Dear Brendan,

I am merging my own pull request.  What up.

- Clare