Re-added code.

Some of the commits removed the code from my previous commit. I've added
it again.