Updated from commit d75f9c205131b800187a28a58577f357a3b233ef.