Put back code so tests keep working

See #2