Hotfix for r368.
This was just what I needed, I found a way to counter the last bug until this one came out.