Bleh

@apg  if you get a chance please review.

I'll merge and deploy later or in the morning if you do.

I realized this once I saw the errors in the logs.