Fix totally dumb error.

Epic fail at how long before I noticed this.
Restore some code I'd commented out earlier to help test