This reverts commit a18debbf21.
a18debbf21
For some reason it didn't include one of the bullet points, here it is: