#600 unshallow