TEMP FALLBACK NC

This is a temporary fallback patch.