Remove prior_invocation hack.

This yields 7 new failures in selftest, which will need tracking
down.