BI Breaking stuff

As always. Something that worked before the latest patch works and then
magically breaks.