Oops, this has been left behind accidentally. I might as well remove this whole file from this PR because I added some stuff to it but ended up removing it after all.