This is being fixed and here is the commit for this 4585182