Rolledback upstream 3cf067049211 because of backwards compat concerns