JCR-2078: reverted code reformat