Is this change from upstream?