CloudBees workaround attempt #1