Reverting the other PR is not  an option as it definitely fixed a bug.