This also removes the changes from commit 1c4bde50bc which was added in order to fix this issue but wasn't ideal as it required plugins to be updated which isnt required with this fix
1c4bde50bc