DF-2152. Restored original code