[FIXED JENKINS-10539] Noting that #841 was merged.