Put back code so tests keep working (see #2)