1.6 has the same bug, unfortunately. Eventually the patch will be `stable`-specific, hopefully.