This reverts commit e1a438dfc9. Should not have been picked into a patch release :)
e1a438dfc9
9fffdb4