Revert "Manual define / array fix OJK"

This reverts commit fc53d2ad011b78c320edf3023d82fc4db3fd6bcb.