I don't think this is needed, but will confirm on the master branch (it just simplifies things a bit)