TEMP FALLBACK NB

This is a temporary fallback patch.