Switch back to Constraints::cost v1