Merge "Let's try casting to fix the build." into nyc-dev