Stashed so I can switch branches to work on Yet Another Stupid Bug That Shouldn't Exist (TM).