[JBJCA-1122] Revert JBJCA-1112