#9749 should fix that.