Turns out I accidentally reverted this a while back

Ooops