Revert "OJK Fixes"

This reverts commit f98dc501f39d3bb1a4a751bc63536f1b440db262.