Merge "Patrially revert 4ec026930bfbbb5d8923f359c8." into nyc-dev