Avoid potential StackOverflowError for CDH mr1 (see SHDP-111)