That should not be happening at all. I just checked the corresponding code section, and it should always include the template from the theme directory if it exists, regardless of anything.
I may have to check this directly to see what is going on. Can you add temporary FTP and back-end access? I will try to run a debug query to see what’s going on in the template engine.