Do @ashb and @evilstreak  agree with this change?