[kramerger]

While this is a double screw up, I really like how the patch corrected the original issue but also removed this complex and unlikely path.