Actually do what I said I did in the last commit

Derp a herp
Ok this time I did it properly

Seriously.