No longer necessary now that there's an explicit flag?