Merge "Partial revert of c1a80b08f08cfb038625cec537390705d16db3f5" into nyc-dev