This reverts commit b1c127741a. Reverted b1c127741a
b1c127741a
All have been tested, install correctly.