Oh jeez, the Ultra shader should be doing exactly what you're describing - I pushed a version earlier this week that *might* have messed something up in that regard, will try and fix ASAP.
