This reverts commits - caf2dd03. - 07ebac6a - 55eff45f I accidentally pushed these commits as I had them lying around on a dirty checkout I did testing on.
