Revert "Refactor!: Update JJB code to comply 5.x"