The script used to make these changes can be found at: https://gist.github.com/Deiz/32322020f76d23e2bf8f
Fixes #1640