Another attempt to remove a fix that happened in another branch.