Fixing the rest of #58

Basically, verified that it was still working after the rollback which
it is.