Revert "Improved carton.lock compat"

This reverts commit f1dd454781dc76db79eb714166ed6a9886821003.