Reviewed r/2207
Patched bug 1002591