Reverted a large portion of e939e4a64dae57e9e760b9766c48205c4a2cc8fd as it was a mistake