Bug 966067 - More inadvertent bustage;r=me

Note to self: never ever rename variables again