Revert previous commit (which was itself a revert).

I missed some stuff in it. Need to try again.