Reverting bad commit

[Kirk Lund]

Looks like I introduced a bad commit. I'm working on reverting it. Sorry
for the inconvenience!