Removed old implementation.