Ported by wassup from a Hybrid CURRENT patch.