[FIXED JENKINS-21394] Change based on feedback