Fix "We retire 1.8.7"-ja