Re #10137. Reverting to version from master to fix unit test.