The code used to fix the issue (bug is signed off, but has not passed QA or been pushed yet):
$overlay_framework = undef if $overlay_framework eq '_USE_ORIG';
The bug has since been updated and signed off again following feedback.  The line changed is now:
    $overlay_framework = undef if $overlay_framework eq '_USE_ORIG_';
If this fixes the issue you are having, it would be really helpful if you could add a comment to the bug or reply to the message.

David Nind
New Zealand