JCR-2355: Revert changes