[WiP] - draft for JENKINS-25771 - bad import removed