Check context and context id as before.

Per [71832098](https://www.pivotaltracker.com/story/show/71832098).  Doesn't correctly check context; had previously fixed but didn't carry over when separating off audit models into their own files.