BZ-9626: Reverting to original issue