This is the same as #6739 which we resolved in 1.9 and 1.8.3.