upstream change in retcon