Revert for afa05d9.

Why? Because ISC did it, that's why.