Restored original functionality.