Potentail patch for 3.10.5

I do not claim this works, boots, or does anything better than kill your
children, set your house on fire and microwave your cats