Merge "Partial revert of 261725fdb2962271c222a049fcdf57bbdc8363c7" into nyc-dev