Revert "Merge pull request #2925 from Segrain/master"

This reverts commit 40fc0f31f4b58fa4d773132f801728b85820f1bd, reversing
changes made to c8b3b541d55230476b3ee2c14a6b657714ac652d.
Merge branch 'master' of https://github.com/Baystation12/Baystation12
Merge branch 'master' of https://github.com/Baystation12/Baystation12