restoring changes overwritten by commit b8fa