If you like to do a PR to revert that please feel free. I'm busy with
other stuff at the moment.