Merge "This assert is triggering when it shouldn't be. Disable it for now." into nyc-dev