Please fix in 1.8 first so we avoid conflicts with 1.9