Fixed problem w/ previous commit.

I had accidently brought in functionality from feature-py3,
by virtue of my text editor coupling branches; sorry for being a
moron.