Reverting this commit. Seems that only the added parts were tested. I'll look at restoring a similar version of this in future.
Reverting this commit. Seems that only the added parts were tested. I'll look at restoring a similar version of this in future.