GRECLIPSE-1586 - some ground work to limp along