This reverts commits - caf2dd037b. - 07ebac6a49 - 55eff45f96 I accidentally pushed these commits as I had them lying around on a dirty checkout I did testing on.
caf2dd037b
07ebac6a49
55eff45f96