Reverted problematic change (with comments).