The old functionality is restored.