Revert "Merge"

This reverts commit cc1b00ea8b8dabf3b91cbaf7175e4818923d924e.
Undo
Revert "Undo"

This reverts commit 17cb8ed1d1fb1ddbb1719eba672967afdddec36f.
Revert "Revert "Merge""

This reverts commit 239309e64b761825594108adc047a5646e82eef3.
Manual Merge

Difficulty working git, done manually.