fix back-port/merge glitch for GROOVY-5409