A hack to fix the Claim#messages= hack on 1.8.7.