Revert the okssld 4k bugfix because it introduced regressions