Reverted problematic change