Update to CPK 6.0.1 and drop monkey patch