reverts conditonal from 7cc84bb

also adds in a TODO comment to clean up this false postive in some way. cc @aerych