as I wrote in the previous comment, I don't think such conditionals are needed any more