attempt at CURRIKI-6628.
paul